Skip to content

chore(l1): standarize revm/levm behaviour when importing blocks. #2452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Apr 21, 2025
Merged

chore(l1): standarize revm/levm behaviour when importing blocks. #2452

merged 4 commits into from
Apr 21, 2025

Conversation

mpaulucci
Copy link
Collaborator

@mpaulucci mpaulucci commented Apr 11, 2025 •
edited
Loading

Description

  • standarize revm/levm behaviour when importing blocks
  • Remove fork choice when importing blocks.
  • Move block importing out of blockchain module

@mpaulucci mpaulucci requested a review from a team as a code owner April 11, 2025 18:07
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 11, 2025 •
edited
Loading

Lines of code report

Total lines added: 22
Total lines removed: 52
Total lines changed: 74

Detailed view 
+----------------------------------------+-------+------+
| File                                   | Lines | Diff |
+----------------------------------------+-------+------+
| ethrex/cmd/ethrex/cli.rs               | 324   | +22  |
+----------------------------------------+-------+------+
| ethrex/crates/blockchain/blockchain.rs | 461   | -52  |
+----------------------------------------+-------+------+

mpaulucci
mpaulucci commented Apr 11, 2025
View reviewed changes
cmd/ethrex/cli.rs

if let Some(last_block) = blocks.last() {
let hash = last_block.hash();
if let Err(error) = apply_fork_choice(&store, hash, hash, hash).await {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

applying forkchoice should set all the blocks as canonical, you don't need to do it explicitly

fmoletta
fmoletta reviewed Apr 11, 2025
View reviewed changes
cmd/ethrex/cli.rs
@@ -306,5 +307,32 @@ pub async fn import_blocks(path: &str, data_dir: &str, network: &str, evm: EvmEn
info!("Importing blocks from chain file: {path}");
utils::read_chain_file(path)
};
blockchain.import_blocks(&blocks).await;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove the method instead of refactoring it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see the point of having such a function. It is ambiguous with add_block(s). What is the point of having a function that adds blocks + calls forkchoice instead of calling the two function separately?

@mpaulucci mpaulucci mentioned this pull request Apr 21, 2025
Closed
@mpaulucci mpaulucci enabled auto-merge April 21, 2025 15:09
@mpaulucci mpaulucci added this pull request to the merge queue Apr 21, 2025
@mpaulucci mpaulucci removed this pull request from the merge queue due to a manual request Apr 21, 2025
@mpaulucci mpaulucci added this pull request to the merge queue Apr 21, 2025
Merged via the queue into main with commit bc9aafd Apr 21, 2025
19 of 20 checks passed
@mpaulucci mpaulucci deleted the standarize-levm-evm-block-import branch April 21, 2025 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmoletta fmoletta fmoletta left review comments

@jrchatruc jrchatruc jrchatruc approved these changes

@ilitteri ilitteri ilitteri approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mpaulucci @jrchatruc @ilitteri @fmoletta